From: awilliam@xenbuild.aw Date: Fri, 12 May 2006 16:21:57 +0000 (-0600) Subject: [IA64] bug fix (for SMP-g) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16070 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=809df00f3bc4a6b1f4de4cf4891b436dd01aa7e9;p=xen.git [IA64] bug fix (for SMP-g) Bug fix for SMP-g: correctly set vcpu_info and map shared_info. (vcpu_info is set by common code). Signed-off-by: Tristan Gingold --- diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index f4a5850d52..11cac65714 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -168,7 +168,6 @@ struct vcpu *alloc_vcpu_struct(struct domain *d, unsigned int vcpu_id) memset(&d->shared_info->evtchn_mask[0], 0xff, sizeof(d->shared_info->evtchn_mask)); - v->vcpu_info = &(d->shared_info->vcpu_info[0]); v->arch.metaphysical_rr0 = d->arch.metaphysical_rr0; v->arch.metaphysical_rr4 = d->arch.metaphysical_rr4; v->arch.metaphysical_saved_rr0 = d->arch.metaphysical_rr0; diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c index 680377f9f3..278cf19b02 100644 --- a/xen/arch/ia64/xen/regionreg.c +++ b/xen/arch/ia64/xen/regionreg.c @@ -258,7 +258,7 @@ int set_one_rr(unsigned long rr, unsigned long val) if (!PSCB(v,metaphysical_mode)) set_rr(rr,newrrv.rrval); } else if (rreg == 7) { - ia64_new_rr7(vmMangleRID(newrrv.rrval),v->vcpu_info, + ia64_new_rr7(vmMangleRID(newrrv.rrval),v->domain->shared_info, v->arch.privregs, v->domain->arch.shared_info_va, __get_cpu_var(vhpt_paddr)); } else {